From: robertl <robertl>
Date: Mon, 5 Apr 2010 13:30:31 +0000 (+0000)
Subject: MSVC cleanups.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~199^2~22
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=0fd8822fae84c1c6834ac2fdb5b883496aab422c;p=gpsbabel.git

MSVC cleanups.
---

diff --git a/bushnell.c b/bushnell.c
index de55ac18d..a26d9e595 100644
--- a/bushnell.c
+++ b/bushnell.c
@@ -158,6 +158,9 @@ rd_deinit(void) {
 static void
 wr_init(const char *fname) {
   char *dot, *slash;
+  static char valid_chars [] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789"
+		".-/\\~@#$%^&*()_+=<>"
+                "abcdefghijklmnopqrstuvwxyz";
 
   ofname = xstrdup(fname);
 
@@ -166,10 +169,6 @@ wr_init(const char *fname) {
   slash = strrchr(ofname, GB_PATHSEP);
   if (dot > slash) *dot = 0;
 
-  static char valid_chars [] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789"
-		".-/\\~@#$%^&*()_+=<>"
-                "abcdefghijklmnopqrstuvwxyz";
-
   mkshort_handle = mkshort_new_handle();
   setshort_length(mkshort_handle, 19);
   setshort_goodchars(mkshort_handle, valid_chars);
diff --git a/bushnell_trl.c b/bushnell_trl.c
index 5f322e602..744a26a7c 100644
--- a/bushnell_trl.c
+++ b/bushnell_trl.c
@@ -108,12 +108,12 @@ bushnell_read(void) {
 
 static void
 bushnell_write_one(const waypoint *wpt) {
+  gbint32 lat = wpt->latitude  * 10000000.0;
+  gbint32 lon = wpt->longitude * 10000000.0;
   trkpt_count++;
   if (trkpt_count > 4502)
     fatal(MYNAME " too many trackpoints.  Max is 4502.");
 
-  gbint32 lat = wpt->latitude  * 10000000.0;
-  gbint32 lon = wpt->longitude * 10000000.0;
   gbfputint32(lat, file_out);
   gbfputint32(lon, file_out);
 }
diff --git a/gopal.c b/gopal.c
index 01b2151ca..412b3de8f 100644
--- a/gopal.c
+++ b/gopal.c
@@ -179,9 +179,9 @@ gopal_read(void)
 	waypoint *wpt, *lastwpt=NULL;
 	double long_old,lat_old;
 	char tbuffer[64];
+	struct tm tm2;
 	long_old=0;lat_old=0;
 	strftime(routename,sizeof(routename),"Tracklog %c",localtime(&tx));
-	struct tm tm2;
 	
 	route = route_head_alloc();
 	route->rte_name=xstrdup(routename);
diff --git a/msvc/GPSBabel.vcproj b/msvc/GPSBabel.vcproj
index 69eb3157c..9f4e1e579 100644
--- a/msvc/GPSBabel.vcproj
+++ b/msvc/GPSBabel.vcproj
@@ -61,10 +61,11 @@
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				WarnAsError="true"
+				WarnAsError="false"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CompileAs="0"
+				ErrorReporting="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -370,6 +371,16 @@
 				RelativePath="..\brauniger_iq.c"
 				>
 			</File>
+			<File
+				RelativePath="..\bushnell.c"
+				>
+			</File>
+			<File
+			<File
+				RelativePath="..\bushnell_trl.c"
+				>
+			</File>
+			<File
 			<File
 				RelativePath="..\cet.c"
 				>
@@ -630,6 +641,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\enigma.c"
+				>
+			</File>
 			<File
 				RelativePath="..\exif.c"
 				>
@@ -1250,6 +1265,10 @@
 				RelativePath="..\itracku.c"
 				>
 			</File>
+			<File
+				RelativePath="..\jogmap.c"
+				>
+			</File>
 			<File
 				RelativePath="..\jtr.c"
 				>
@@ -1802,6 +1821,10 @@
 				RelativePath="..\pdbfile.c"
 				>
 			</File>
+			<File
+				RelativePath="..\pocketfms_wp.c"
+				>
+			</File>
 			<File
 				RelativePath="..\pocketfms_bc.c"
 				>
@@ -2170,6 +2193,10 @@
 				RelativePath="..\skyforce.c"
 				>
 			</File>
+			<File
+				RelativePath="..\skytraq.c"
+				>
+			</File>
 			<File
 				RelativePath="..\smplrout.c"
 				>
@@ -2266,6 +2293,10 @@
 				RelativePath="..\tef_xml.c"
 				>
 			</File>
+			<File
+				RelativePath="..\teletype.c"
+				>
+			</File>
 			<File
 				RelativePath="..\text.c"
 				>
@@ -2646,6 +2677,10 @@
 				RelativePath="..\wfff_xml.c"
 				>
 			</File>
+			<File
+				RelativePath="..\wintec_tes.c"
+				>
+			</File>
 			<File
 				RelativePath="..\xcsv.c"
 				>
@@ -3235,16 +3270,12 @@
 				RelativePath="..\defs.h"
 				>
 			</File>
-			<File
-				RelativePath="..\defs.h"
-				>
-			</File>
 			<File
 				RelativePath="..\filterdefs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\garmin_device_xml.h.h"
+				RelativePath="..\garmin_device_xml.h"
 				>
 			</File>
 			<File